merge of shock code

my most important change