final commit after miguel design