Modify top block detection for shape calculation
Code formatting
Update jar