Added a bit more functionality