Testing

The code in this branch is made for testing purpose but this merge is only for translation and unneeded code removal