Changed the structer a bit.