Shake debugged.
Sources cleaned