Adding casts back in