tried BC stuff, expect some in future
Fixed bug