Removed unnecesary ifs (following new)