Add some stuff to finish the 100$ work