Sorry forgot some essential thens and ends