I will post another version on this later