added setup! in controller
updated whitelist