Added a few temporary controls