added more methods from stormify