Temporary code changes for keps. Need to be removed later.