Improve make card