added lotsa shit