#! changes in design