working on unifying this branch with the standard branch