moved changed to a method