moved some methdos