Last changes
Cell bug fix