Removed old requires
Updated version with latest changes