Rework based on the feedback- 2nd. (https://github.com/Moncader/SWFCrew/pull/76)