Updated to remove top-down