Yep, just trying to reduce the amount of duplicated work ; )