last commit! final bug removed