First draft without generated stuff