solved properly