Changed back to standard define