Bha rework
tha corrections