Update bug solved and bit of designing