Updated to use FASTDOM