Modified in a better way