Fixed folow and block implementation

Have to finish it