Cleaned up + added cond. thin