modified at and stuff, resolves #126