Added some custom functionality
Initial fork commit