Moved around couple of methods