added sammy and mako