Width not hard-coded anymore