synced with latest update of Novocane