removed returns, added keywords etc...