Removed Controller due to issue #7