Added some more code

Makes it more fluent