Added my own little touches