uploaded final version with fixed to cases and whatever