Amended more blocks like this