I like this change :) *Need to rebase my patch*