improved lazy load, added sgnaf
solved conflict