added lotsa shiat