changes and checks added