Making this project more unversal :p