minor changes, i must understand this stack before doing anything ;)