changing order
updating Marcin