finally done well almost