Modified to remove unnecessary ordering