Changed header to be static.
Made things more loose