More workish and fix