damn, another minor mistake and changes