tried to improve setup file