hot fix, stable dependencies and TODO replacement for skeleton