Renamed amazon controller, added delegate