Follows specs more
Added name