Updated with some special stuff I/we needed