Started fixing emboldening bug