simplified the assemlies