Updates for ticket 90 and 60