removed
minor
added joins, changed signatures