Sunday Afternoon update

Updates after talking with Jespal