Improvments on activity