Removed requirement on malloc... Probably