Fixed a mistake in the first features
Working on the second feature