Partial code for #60