much better, only could edit that