now better handling the join action