Added functionality thanks to bollu