Re-structured methods, v.1