Fixed with Erics initial feedback