Cleaned up shins problems