[SQUASH ME] more neat stuff added