Added a couple new features