Final touches I hope