Revert "Remove all modifications to test another way"

This reverts commit c73b3eca5efb5cb14569db7357183f25e8b1ea58.
Further changes gbipbox