Implemented more assembly