New handler added and added some modifications