fixing issues for implementation