Bug hopefully fixed and added a new method