fixed two method calls (wrong since functions moved here)