including previous version as comment
simplifying