Some cool modifications