much needed redesign-compressed