Javelin redesign