Added comments and other helpers