Made use of the two new properties

(@jacob1, happy now?)