Cleaned up some scar tissue, combined the two ron functions