last commit after miguel design