Made changes, does not look promising will do major changes in next commit