added setup
added setup - working