changed some things thinking it is correct now. Yet very unsure about that.