Final commit with tweaks