Reworked code

removed speed feature