Adding and fixing more methods