Final tweaks for now I hope!