Baaah reworking