Kinda a final Version
kinda final version