Shaker 1000 issues

#1
#2