work on activity and fixing associatiotns