Rb

Merging better code into project.