Implementation changes fixed
Further enhancements