that's exactly my solution written in a slightly different way! so you can't be wrong! haha ... you could've simplified your result using the identity:
regarding Danny's solution: i think and not (hopefully somebody will check this!). then his solution can be fixed: and
thus and hence which is exactly what i got in my previous post