Modified to not include Eclipse stuff