removed order check