Minor changes + implementation