Free surface version of aspect, with some additional stuff