updated with join table query
updated with join table query
updated with join table query