nescitus reverting last commit, has been buggy