OK looking less buggy now