latest changes from original rrssb project
latest changes from original rrssb project