#40 modified spec based on feedback from users and dev