Added solutions, edited animation timings