updates in first post, check please.