Changes applied for first problem