Added small changes to fit spec