removed all changes except bug fix