Firs try of modification