coordinated with Omars stuff