updated and rebased