changes in form and new static class ahoi