Better handling of activity