HARDER + Made code more elegant