Fixes added and code performed