implemented right solution