Added all intended features