Added if statement. Needs works