Implemented methods from previous alpha.