Here as well - remove x?