fixed procedures so they don't hardcode user