latest changes with bug fixing