added my changes since fork