Updated casting based on suggestions