Quick few changes