changed typing and fixed width