Still fixing the association issue