Added some freedom
More freedom