Controller should handle operations in the proper order now.