ok, apply this logic 6d126ca