Added EVERYTHING I NEEDED