added not-completet stuff