Fixed all previous bugs