Changed to be more usable