Changes as requested by Sseko