shit logic updated 0.3v