Little improvments + photo