Created some additional functionality